Merge "Revert "Add view models for volume dialog ringer drawer"" into main