Merge "Fixing Launcher3QuickStepGo targets" into main