Merge "Add settings page for notification channel groups"