Merge "fix [3312683] Camera mirroring problem after switching from back to front camera" into honeycomb