Merge "Improve stack unwinder robustness."