Merge "fix performance regression on qs_new_tiles" into main