Merge "Ensuring that isPictureInPictureMode() mirrors dispatched mode." into oc-dev am: 5b4e16c3a5
am: d02aa22f18

Change-Id: I2b689c23fbb1fb6157ab7f57d67315152888a713