Merge "Fix incorrect logic in multi-finger multi-tap and hold." into sc-dev