Merge "Make sure TAPL waits for Launcher activity to stop each time it stops" into main