Merge "Removing flake when 2 long-press events happened on single long press" into ub-launcher3-master