Merge "Use new create/removeInputChannel()."