Merge "Fix logic error in SkipCutBuffer.cpp"