Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev

applications/services/desktop/desktop.c

@@ -484,6 +484,8 @@ int32_t desktop_srv(void* p) {
 
     if(!furi_hal_is_normal_boot()) {
         FURI_LOG_W(TAG, "Skipping start in special boot mode");
+
+        furi_thread_suspend(furi_thread_get_current_id());
         return 0;
     }
 

applications/services/desktop/scenes/desktop_scene_pin_timeout.c

@@ -1,5 +1,4 @@
 #include <furi.h>
-#include <FreeRTOS.h>
 #include <gui/scene_manager.h>
 
 #include "../desktop_i.h"

applications/services/desktop/views/desktop_view_pin_timeout.c

@@ -2,7 +2,6 @@
 #include <furi.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <FreeRTOS.h>
 #include <projdefs.h>
 #include <input/input.h>
 #include <gui/canvas.h>