Merge "Fix wrong constant for R8 GL upload" into main