Merge "Consume ACTION_UP when fling is detected on top of icon" into ub-launcher3-calgary-polish
am: 70a421e224

Change-Id: I137233073999cf59871545c54b63f8bd889fdf8e