Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce