Merge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev