Revert "Revert "Make sure to dispose services supporting the XComponent protocol""

This reverts commit 044be7107a97169e80360c79a9d07bec263ac818.

It only works sometimes. Still a deadlock based on a race condition.