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