Merge "Remove the input consumer surfaces when the consumer is disposed" into...
Merge "Remove the input consumer surfaces when the consumer is disposed" into rvc-dev am: 616fcd81 am: a7f4ee62 am: 2d3346fa am: 233adb5e
Change-Id: I55d10da346b83aca481544697424e51b6cf3a263