Merge "CCodec: make config consistent before/after flush"