Merge "Attempt to fix TaplUninstallRemoveTest.testUninstallFromAllApps" into main