Merge "Change thread suspend timeout to be fatal for non-debug"