Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce