Merge "Add Haptics to the new VolumeDialog." into main