Merge "Fix an IndexOutOfBoundsException when dragging to add widgets." into main