Camera: fix camera facing override logic am: 13cd59a7ea
am: e67f6da367

Change-Id: Ie356c8cf4f0b15cce677ecc5e5954b97bea775c0