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

* commit 'c87c21a0cd168c65c70b59ad12502a2e1a00b9c4':
  Small refactor to separate adding workspace / all apps items