Fix camera orientation again

Change-Id: Id01cf80babd47914e90f55399e35ebaaa57f3960