am a5db8beb: Merge "Refine camera fatal error handling in CameraActivity." into ub-camera-glacier

* commit 'a5db8bebb51ff666b4fa4bbadc3d0457f36041f2':
  Refine camera fatal error handling in CameraActivity.