Merge "Using DragObject for folder drop instead of maintaining states when drag starts from inside a folder" into ub-launcher3-calgary-polish
am: 1e35fbbac7

Change-Id: I82e18807efe254f86df434dc73c94f951f041c3a