Merge "Remove system properties that gates virtual displays in VR." into oc-dev