Merge "Fix check for thread unwind."