Merge "Migrate gettid to GetThreadId" into main