Merge "Make volume sliders scroll when the panel uses horizontal layout" into main