Merge "Add vibrate icon to the ringer and notification sliders" into main