Merge "Remove the input consumer surfaces when the consumer is disposed" into rvc-dev