Shorten Thread name by removing query string.
Merge branch 'vml-rmott-thread-name-shorten'