Merge "Suppress reordering when QS is expanded over Communal" into main