Merge "Update drag and drop visualizations" into sc-dev