Merge "Fix issue with drop target when dragging new widget." into main