Merge "Fix VR->VR Activity transitions." into nyc-dev