Merge "Rewrite unwind thread handling."