Merge "Camera: fix camera facing override logic"