Merge "Fix pip enter/expand from split-screen secondary." into rvc-dev am: 074701fa30

Change-Id: I58f9ddc3c82b454c7414572509570008741f247c