am af714f9e: Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad

* commit 'af714f9ec3264211cb00139ffe0f05d55085ffc2':
  Fix the mapping between preview UI and camera sensor