Merge "Fix flaky test ThreadStartTest"