Merge "Allow some notifications in a group to be muted" into oc-dev