Merge "Make volume slider in volume panel consistent with settings app" into main