am c87c21a0: Merge "Small refactor to separate adding workspace / all apps...
am c87c21a0: Merge "Small refactor to separate adding workspace / all apps items" into ub-now-lunchbox
* commit 'c87c21a0':
Small refactor to separate adding workspace / all apps items