Merge "Move VR preference for portrait orientation." into oc-dr1-dev
am: 7c4069d255

Change-Id: I3fee2180df9f1b18aae17eeae97b5f0006226c64