Merge latest PowerSaving-v17 while preserving shared GPS power control

variants/wio_wm1110/platformio.ini

@@ -32,7 +32,7 @@ build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/sensors>
   +<../variants/wio_wm1110>
 debug_tool = jlink
-upload_protocol = jlink
+upload_protocol = nrfutil
 lib_deps = ${nrf52_base.lib_deps}
   ${sensor_base.lib_deps}
   adafruit/Adafruit LIS3DH @ ^1.2.4
@@ -91,8 +91,8 @@ build_src_filter = ${wio_wm1110.build_src_filter}
 lib_deps =
   ${wio_wm1110.lib_deps}
   densaugeo/base64 @ ~1.4.0
-
-[env:wio_wm1110_kiss_modem]
-extends = wio_wm1110
-build_src_filter = ${wio_wm1110.build_src_filter}
-  +<../examples/kiss_modem/>
+
+[env:wio_wm1110_kiss_modem]
+extends = wio_wm1110
+build_src_filter = ${wio_wm1110.build_src_filter}
+  +<../examples/kiss_modem/>