Merge "Ensure thread_list_lock_ is correctly locked"