Support for adding live folders in the default workspace

Change-Id: I69fe7bde3e8247ce574ddbbeba942344c761842a