Merge "Add qs_new_tiles_future flag" into main