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

Change-Id: I5de19445a66982a5a40fdb989011cf70b764b3b2