Merge "Handle implicit stack overflow without affecting stack walks"