Merge "Add notification listener plugin hook" into oc-dr1-dev