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

Change-Id: Ie146b08ded70a24bbdc4b681c72724807e26717e