Merge "Ensure that a PIP activity gets stopped before MW/PIP mode changes." into oc-dev