Merge "Have a new constant for "vibrate when ringing" setting" into jb-dev