Merge "Update drag-and-drop to support resizeable widgets" into main