Merge "Small refactor to separate adding workspace / all apps items" into ub-now-lunchbox