Merge "Fixing drag getting stuck due to mismatch touch events" into ub-launcher3-master