Merge "Deflake WorkerThreadTest" into sc-dev