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

Change-Id: Ica3c610cf91ca4b9415fa500f3598c5597297d2c