Merge "Change to output ArrayMode if using SkipCutBuffer" into main