am 08acce5b: (-s ours) Merge "DO NOT MERGE Don\'t call stopPreview after taking a picture on the m8" into gb-ub-photos-denali

* commit '08acce5b16beef4be30c5d0567d3452aa7e99c26':
  DO NOT MERGE Don't call stopPreview after taking a picture on the m8