Merge "Ensure that velocity tracker is never null." into rvc-dev