Merge "Track velocity of velocityPointerId only if is present" into main