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

Change-Id: I41849e0a00644592fd1e9d0a89a337a5a0a002fa