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

Change-Id: I5ee2ddbcd16020222ee22fd3ec3b50678ec20ee6