Merge "Fix drag-n-drop from the pin widget flow" into sc-dev