Merge "Set the same vibrate settings for ringer and notifications." into ics-mr1