Merge "Preventing concurrentmodification exception when dragging a icon with shortcuts from inside a folder" into ub-launcher3-calgary-polish