Merge "Ensure new InputConsumer resampling behavior does not change" into main