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

Change-Id: I9e09c229e2757b35a69c2ad79176557683f7fb07