Merge "Do not invoke callbacks when InputConsumer is destroyed" into main