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

Change-Id: I71319a1c73da63640370508b17cb6c7fab4a223e