Merge "Camera: Add bandaid for preview orientation on reverse-landscape cameras" into nyc-dev