am cfcaa31f: Merge "Work on issue #17381033: Program icon and shortcut disappear after..." into lmp-dev

* commit 'cfcaa31f5136b44da4b8b9ae16ec3311d9c7cdde':
  Work on issue #17381033: Program icon and shortcut disappear after...