Merge "[Thread] add ServiceManagerWrapper" into main