Merge "Avoid service wrapper initialization deadlock." into pi-dev