Merge "Use groove for volume dialog slider" into main