Merge "Ensuring that isPictureInPictureMode() mirrors dispatched mode." into oc-dev