Merge "Add volume sliders UI" into main