Merge "Fix issue with double tapping PiP" into oc-dev