Merge "Add a jerk tracker to MotionPredictor" into main