Merge "Fix several issues with hub scrolling during widget drag-and-drop." into main