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