Merge "Use std:shared_ptr for InputChannel"