Merge "Avoid NoSuchMethodError of List.removeFirst() on 24Q2" into main