Merge "Fix control alignment for single- and multi-select dialogs"