am 8b03cc08: Merge "Populate the default workspace earlier" into jb-dev

* commit '8b03cc083f3f5749ec4a87a9bcf5ed4dfc780b2d':
  Populate the default workspace earlier