re-gummyfy the workspaces

Change-Id: I9999742652bf70b054943a582f4169db149584b2
Merge "re-gummyfy the workspaces" into kk4.4