Merge "Always waiting for launcher stop from launchIntoSplitScreen()" into main