Merge "KafkaHandler: allow customizing timeouts"