Merge "Tweak VelocityTracker. Bug: 5265529"