Merge "Only prune non-pointer events" into main