California to create new 'Office of Data and Innovation' with agency merger