Merge "Fix AppOps exception for notification channel toasts" into oc-dev