Merge "Fix NPE when the vr manager isn't around at first." into nyc-dev