Merge "Add settings default handling for STATUS_BAR_SHOW_VIBRATE_ICON"