Merge "Fix thread unwind in CallStack."