Merge "Reset velocity for pointers that have been canceled" into main