Merge "Disable PiP when VR mode starts." into oc-dev