Merge "Separate mute and vibrate icons in status bar" into sc-dev