Merge "Fix the test flake in testRemoveServicesAfterSocketDestroyed" into main