Merge "Prevent non-fullscreen activities from triggering auto-enter PiP" into oc-dr1-dev