Merge "Add flag to reset notification channel importance"