Merge "WA: Queue extra buffers on output port during reconfig if input EOS-ed" into klp-dev