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