Merge "VolumeDialogImpl: Respect multiple visible rows in landscape"