Merge "Change snoozing behavior for notifications in groups" into oc-dev