Merge "Fixing TaplUninstallRemoveTest#uninstallWorkspaceIcon" into main