Merge "Revert^2: Fix pip enter/expand from split-screen secondary." into rvc-dev am: d4551c1d93 am: 873710398a am: 1a83dc3d59 am: 70467b94f4

Change-Id: I43c36779b5d83529b7a3b454f448bbadcb3e0100