Merge "Rotate only VR secondary display" into oc-dr1-dev