Merge "If an Activity transitions to VR, then ensure it's in the main stack." into oc-mr1-dev