Merge "Fix flaky history job service test" into main