Merge "Fix issue with Thread.setName hanging after Thread.start"