Merge "Revert "Fix pip enter/expand from split-screen secondary."" into rvc-dev