Merge "Fix Launcher preview display size" into main