Merge "Fix Drag and drop bug when moving a tile within the current list" into main