Merge "Second reland "Use new create/removeInputChannel().""