Merge "Add settings for altering VR display behavior." into nyc-dev