Merge "Fix input channel leak. Bug: 5156144"