Merge "No switch camera when switching camera" into gb-ub-photos-denali