Merge "Fix tee sink 12-channel file write"