Merge "Remove jank on camera options switching" into ub-camera-glacier