Merge "Don't set mCameraAppUI to null in onDestroy" into ub-camera-glacier