am 2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev

* commit '2b45d84e24946d0cbbcc577ca3e195c0db687c9a':
  Unhide Notification kind, rename to category.