Merge "Don't hide a slider if it's already being shown in the VolumeDialog" into main