Merge "Fix buffer damage for quad-buffer"