am e546d48b: Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad

* commit 'e546d48b4acfbf2441b685b2c7d6a4e14241f34b':
  Fix crash when trying to reopen the camera.