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