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