Merge "Cleaning up InputConsumers"