Merge "Prevent buggy display orientation when exiting vr" into oc-dev