Merge "Move overflow checks into SkipCutBuffer"