Merge "Use unique_ptr when creating InputChannel"