Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier