Merge "Fix qs_new_tiles flag assert" into main