Merge "Checks for existence of vr components before trying to disable them." into nyc-dev