Merge "Fixing issue with activity incorrectly auto-entering PiP." into oc-dev