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

Change-Id: I5028a6f298eb2c961556760b6ea248c673c13ba6