Merge "TaskOverlayFactoryGo: Minor updates for testability" into sc-dev