Merge "Waiting for Launcher activity to stop when starting an overview task" into main