Merge "We notify VR Core when a 2D intent is running in VR in persistent mode." into oc-dev