Merge "API for notification listener for Companioon apps" into oc-dev