Merge "Fixing drag and drop framerate regression in workspace"