Merge "Fixes splitscreen when executed from fullscreen app" into pi-dev
am: 765801d5fb

Change-Id: I43d03c1e5423b0a6117f91b10e8c179a459c221c