Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier