Merge "Make agent threads retain their thread names"