Merge "Ensure that we don't overwrite suspension target thread"