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

Change-Id: Ie03f08987e076acdbf943c4eba1030b6da1da2f0