Merge "Fix false alarm on thread suspend timeout"