Merge "Revert "Add flag to enable jerk prediction pruning."" into main