Merge "Add setting for showing the vibrate icon in status bar" into sc-v2-dev