Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier