Merge "Fix NumberFormatException in LauncherTests" into main