Merge "Populate the default workspace earlier" into jb-dev