Merge "CCodecBufferChannel: fix output delay/reorder config"