Merge "Fix icons vanishing when dragged within folder" into ub-launcher3-qt-future-dev
am: 734574221b

Change-Id: I857a428a0a828a922482372dbe63a8bd3bbd233b