Merge "Do not create worker thread if threading isn't enabled"