Merge branch 'macos-fixes' into 'main'

For main

See merge request GNOME/gtk!6032

gtk/gtkactionmuxer.c

@@ -325,6 +325,9 @@ gtk_action_muxer_get_group (GtkActionMuxer *muxer,
 {
   Group *group;
 
+  if (!muxer->groups)
+    return NULL;
+
   group = g_hash_table_lookup (muxer->groups, group_name);
   if (group)
     return group->group;

testsuite/gtk/test-focus-chain.c

@@ -78,7 +78,7 @@ quit_iteration_loop (gpointer user_data)
 }
 
 static void
-wait (guint millis)
+timed_loop (guint millis)
 {
   gboolean keep_running = TRUE;
 
@@ -145,7 +145,7 @@ generate_focus_chain (GtkWidget        *window,
         }
 
       g_string_append_printf (output, "%s\n", name);
-      wait (100);
+      timed_loop (100);
       count++;
 
       if (!first)