Merge "Fix NPE in Workspace.onDropCompleted" into jb-ub-now-kermit