Merge "(Officially) make Modes dialog one-mode-per-row" into main