I have the same issue. However the workaround did not help in my case.
Topic:
Developer Tools & Services
SubTopic:
Xcode