Merge "We were accidentally sending out an output buffer before the final port settings change"