Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier