Merge changes from topic "update-strings" into main

* changes:
  Add comments on suggestion category related strings
  Clean-up unused categories (follow up cleans up strings)