Merge "Revert "Add a callback thread to ConsumerBase"" into nyc-dev