Merge "Update the action bar style to match Bryce" into gb-ub-photos-carlsbad