Merge "Merge "We notify VR Core when a 2D intent is running in VR in persistent mode." into oc-dev am: 13fb1d3471 am: 11a2a5097b"