Merge "Fix RenderThread and worker thread names used by tools"