Merge "Fix bug #4972141 Overlapping content in single-choice dialogs"