Fixing icon dragging
am: b3e2cd3d88

Change-Id: I979006064939699e82bf3b4bdcd34b2073124497