Merge "move network notification IDs to central registry" into oc-dev