Merge "Allow VR Virtual display to rotate with content." into oc-dr1-dev