Merge "DND apps might not have a service, and that's ok" into oc-mr1-dev