Merge "Fixing issue with double tapping PiP." into oc-dev