Merge branch 'master' into dev-priv/master

# Conflicts:
#	selfdrive/controls/lib/lateral_planner.py

common/params.cc

@@ -238,6 +238,8 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"EnforceTorqueLateral", PERSISTENT},
     {"EnhancedScc", PERSISTENT},
     {"GapAdjustCruise", PERSISTENT},
+    {"GapAdjustCruiseMax", PERSISTENT},
+    {"GapAdjustCruiseMin", PERSISTENT},
     {"GapAdjustCruiseMode", PERSISTENT},
     {"GapAdjustCruiseTr", PERSISTENT},
     {"GmapKey", PERSISTENT},

selfdrive/manager/manager.py

@@ -70,6 +70,8 @@ def manager_init() -> None:
     ("EndToEndLongToggle", "1"),
     ("EnhancedScc", "0"),
     ("GapAdjustCruise", "1"),
+    ("GapAdjustCruiseMax", "0"),
+    ("GapAdjustCruiseMin", "0"),
     ("GapAdjustCruiseMode", "0"),
     ("GapAdjustCruiseTr", "4"),
     ("GpxDeleteAfterUpload", "1"),