Merge "Haptic feedback when ringer set to vibrate"