Merge changes from topic "b294333850-MailMail" into main

* changes:
  Adds group to DND settings if channel names same
  aconfig flag for dnd app settings channels dedupe