Merge "Fix notification ordering for groups"