Merge "Adjust camera menu further" into gb-ub-photos-bryce