Merge "CCodec: remove queue timeout"