Merge "Alternative fix for preventing PiP from screenshot sharing." into oc-mr1-dev