Preventing concurrentmodification exception when dragging a icon with shortcuts from inside a folder
am: d0d495f508

Change-Id: I9254264ae8a85f013efc0966fcf05ad826ca4790