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

Change-Id: Ib9464540206d4c851529e0b0920ac8751c6401dd