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

Change-Id: I14ae8bc6833efae6a1d64ccf438f1eb0e8b27dda