Merge "Fix drag-n-drop for recommended widgets" into sc-dev