Merge "Rotate only VR secondary display" into oc-dr1-dev
am: 425784eef2

Change-Id: I707a8d190d2ef86a0e66cadaa4a9b050b39ad4dc