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

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