Merge "[Thread] fix Thread unit test failures" into main