Merge "Fix notification ordering for groups" into oc-mr1-dev