Merge "Tweak velocity tracker. Bug: 5265529"