Small refactor to separate adding workspace / all apps items

Change-Id: I06b7bc7f7f0e01696cb9670b8385e5148593e3e0
3 files changed