Merge "Fix flaky WorkerThreadTest" into sc-dev