Merge branch 'ofw-dev' into dev

applications/main/infrared/scenes/infrared_scene_universal_ac.c

@@ -21,11 +21,11 @@ void infrared_scene_universal_ac_on_enter(void* context) {
         0,
         6,
         15,
-        &I_power_19x20,
+        &I_off_19x20,
-        &I_power_hover_19x20,
+        &I_off_hover_19x20,
         infrared_scene_universal_common_item_callback,
         context);
-    button_panel_add_icon(button_panel, 4, 37, &I_power_text_24x5);
+    button_panel_add_icon(button_panel, 10, 37, &I_off_text_12x5);
     infrared_brute_force_add_record(brute_force, i++, "Off");
     button_panel_add_item(
         button_panel,

applications/main/lfrfid/lfrfid.c

@@ -193,11 +193,11 @@ int32_t lfrfid_app(void* p) {
                 dolphin_deed(DolphinDeedRfidEmulate);
             } else {
                 // TODO: exit properly
+                view_dispatcher_stop(app->view_dispatcher);
                 lfrfid_free(app);
                 return 0;
             }
         }
-
     } else {
         view_dispatcher_attach_to_gui(
             app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);