merge: upstream/master vers epoch-1.8.0

# Conflicts:
#	iced
#	src/surface/action.rs
#	src/surface/mod.rs
#	src/widget/text_input/input.rs
#	src/widget/toaster/widget.rs

src/app/mod.rs

@@ -394,7 +394,7 @@ where
         {
             nav = nav
                 .window_id_maybe(self.core().main_window_id())
-                .on_surface_action(|m| crate::Action::Cosmic(crate::app::Action::Surface(m)))
+                .on_surface_action(|action| crate::Action::Surface(action.flatten()))
         }
         let mut nav = nav
             .into_container()