Merge "Fixes splitscreen when executed from fullscreen app" into pi-dev