Merge "Revert "DO NOT SUBMIT: Hide VR features for preview."" into nyc-dev