Simplifying add to workspace by not going through the worker thread

Change-Id: I3260786bee257aea93ade49e6fa18008232addbe
4 files changed