Merge "Revert^2: Fix pip enter/expand from split-screen secondary." into rvc-dev am: d4551c1d93

Change-Id: I1b0f3fde4f2b51ac0822429adba77fd37781ca65