Merge "options bar ui fixes" into gb-ub-photos-denali