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

Change-Id: I0f136beed5de56795e20b14bbe2e64c4290d0e99