Merge "Fix bug in finding another thread's TCB."