Merge "Don't delete new notification channels not present in backup" into oc-dev