Merge "Prevent buggy display orientation when exiting vr" into oc-dev am: 95d4e52244
am: 71c79d34f7

Change-Id: I823d21b127cd9e90a536da7df3517f16812701c3