Merge "Fix bug for qs_new_tiles aconfig flag" into main