Merge "Modify the behavior of thread suspend shootouts."