Merge changes from topics "add-mode-dialog", "nicer-icon-header" into main

* changes:
  Provide a method to get the default icon for a type
  Support "in-memory" ZenMode
  Supply icon (in addition to name) for addCustomManualMode()