Merge "Fix launcher crash on configuration changed" into main