Merge "Refactoring some loadWorkspace logic in a separate class" into ub-launcher3-master