Merge "Refactor JerkTracker and MotionPredictor for better testing." into main