Merge "CCodec: reorganize max dequeue count update"