Merge "Fix Launcher preview crash" into main