Merge "Fully reset SkipCutBuffer state in clear()"