Merge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc-dev