Merge remote-tracking branch 'upstream/dev' into led-manager

# Conflicts:
#	src/helpers/CommonCLI.cpp

examples/companion_radio/main.cpp

@@ -216,6 +216,10 @@ void setup() {
   sensors.begin();
   if (board.ledManager) sensors.setLEDManager(board.ledManager);
 
+#if ENV_INCLUDE_GPS == 1
+  the_mesh.applyGpsPrefs();
+#endif
+
 #ifdef DISPLAY_CLASS
   ui_task.begin(disp, &sensors, the_mesh.getNodePrefs());  // still want to pass this in as dependency, as prefs might be moved
 #endif