Merge "Fix crash when hotseat icon is dragged onto Workspace" into sc-v2-dev