Fix: Restore workspace gradients when returning from Widget drop

Change-Id: I08927ea359460f60cebe1b942273a24eea8f86d5
Merge branch into mkl