Wait for unwatch (and index clearing) to finish before getting the new project root - for #6540
Merge from master
Merge pull request #6548 from adobe/nj/issue-6540

Wait for unwatch (and index clearing) to finish before getting the new project root