Merge "Fix old stack frame size check"