Merge "Camera: fix camera facing override logic" am: 853f568b31 am: f02844c434 am: 379254d561
am: a48a22dea9

Change-Id: I1c2094ec82dd3ec84bf128bf76132b756323302d