Merge branch 'stable-3.5' into stable-3.9

* stable-3.5:
  Consider change task siblings & their descendants for duplicates
  UI: Remove 'show all'/'hide all' button from the task
  UI: Add task icons to chips
  Fix plugin type names-factory nodes

Icons were not getting displayed in the task chips when merging 3.5
to 3.9. Fix the icon type to work in 3.9.

Screenshots: https://imgur.com/a/ZQQbY47

Change-Id: Id2fee7c96e3d41f278e3e6df611f750eb56b55e5