Merge "Add notification channel support."