Merge "Dismiss immersive mode overlay while in VR mode." into nyc-dev