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

Change-Id: Ib9f158d5dc78b0cd7fa74ac49027be6c3af53776