Merge "Rework VolumePanelRadioButtons using Layout" into main