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

Change-Id: I8cc44392fdbedd336f82fe836843fc60b9170744