Merge "Fixing TaplUninstallRemoveTest#uninstallWorkspaceIcon test" into main