Merge "Correct off-by-one error in SetThreadName"