Merge "Reduce padding in Modes dialog and make marquee less eager" into main