Merge "Merging stylus click logic in longpress helper for better state-management" into ub-launcher3-master