Merge "Shorten thread names"