Merge "Make sure we return input/output buffers to the codec not just while"