Merge "Disables VR components by default, but enables them if a VR app is installed." into nyc-dev