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

* commit 'd109a7d428cfb6f2f8f504ea9a2b3185a2b46283':
  We were accidentally sending out an output buffer before the final port settings change