Merge "Fix Hard to detect multi-finger multi-tap" into rvc-dev