Merge "Revert "Reland "Use new create/removeInputChannel()."""