am 7a3ce60c: Merge "Prevent NullPointerException of PhotoModule in quick resume-pause." into ub-camera-glacier

* commit '7a3ce60cfe7f5a554ab8edeb08c203196b17b164':
  Prevent NullPointerException of PhotoModule in quick resume-pause.