Merge "Add filtering to notification channel settings" into sc-dev