Merge changes from topic "am-f8cfbb03-ab08-49c2-b587-0dcf40840504" into ub-launcher3-master

* changes:
  [automerger] Fix bug where dragging app from Search breaks Folder preview. am: 4f59381bc4
  Fix bug where dragging app from Search breaks Folder preview.