Merge "Fix occasional long ThreadSuspendSleep"