am 3a088524: Merge "Rewrite unwind thread handling."

* commit '3a088524cbd00c140c8fe043ce989ddcf28e7042':
  Rewrite unwind thread handling.