Merge "Fix activity leak in QuickstepLauncher" into main