Merge "Waiting for Launcher activity to stop when starting a Launchable" into main