Merge "DEFAULT_VIBRATE must always use the default vibe pattern" into jb-mr1.1-dev