Merge "Use Result<InputPublisher::Finished> instead of callback -- try 2" into sc-dev