Merge "Maintain the users current value for STATUS_BAR_SHOW_VIBRATE_ICON"