Merge \"Fixing regression where the source icon becomes visible while dragging\" into ub-launcher3-calgary
am: c664f24de2

Change-Id: I5dc1dde72bcf781481b50c538d55ce37b4924be4