Merge "Ensure we pass the pointer id to the velocity tracker and not the index" into sc-dev