Merge "Fix issue where widget disappears when reordering" into main

        val targetItem =

            if (communalWidgetResizing()) {

                state.layoutInfo.visibleItemsInfo.findLast { item ->

                    val lastVisibleItemIndex = state.layoutInfo.visibleItemsInfo.last().index

                    val itemBoundingBox = IntRect(item.offset, item.size)

                    draggingItemKey != item.key &&

                        contentListState.isItemEditable(item.index) &&

                        (draggingBoundingBox.contains(itemBoundingBox.center) ||

                            itemBoundingBox.contains(draggingBoundingBox.center))

                            itemBoundingBox.contains(draggingBoundingBox.center)) &&

                        // If we swap with the last visible item, and that item doesn't fit

                        // in the gap created by moving the current item, then the current item

                        // will get placed after the last visible item. In this case, it gets

                        // placed outside of the viewport. We avoid this here, so the user

                        // has to scroll first before the swap can happen.

                        (item.index != lastVisibleItemIndex || item.span <= draggingItem.span)

                }

            } else {

                state.layoutInfo.visibleItemsInfo