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