Merge pull request #3775 from alexrp/main-thread-name