Merge "fix [3260137] Sometimes front-facing camera mirroring is wrong"