Merge "Don't tear down notification channels." into oc-dev