Merge "Add multiuser support for enabling notification listener" into oc-mr1-dev