Merge "Whitelist noti listeners on user creation" into oc-mr1-dev