Merge "Separate the tasks on the main sync and test worker thread" into main