Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad