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