Merge "fix(MultiFingerMultiTap): Delete lots of duplicated code" into main