Keymap with neo 2 breaks other layout groups about libxkbcommon HOT 5 CLOSED

[keyboard]
keymap_layout=de,us
keymap_variant=neo,dvorak-alt-intl

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 1f99efe3..c7a5e887 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -4599,6 +4599,20 @@ workspace_move_surface_down_binding(struct weston_keyboard *keyboard,
 	take_surface_to_workspace_by_seat(shell, keyboard->seat, new_index);
 }
 
+static void
+keyboard_layout_next_index(struct weston_keyboard *keyboard,
+			   uint32_t time, uint32_t key, void *data)
+{
+	struct desktop_shell *shell = data;
+	struct weston_seat *seat;
+
+	if (shell->locked)
+		return;
+
+	wl_list_for_each(seat, &shell->compositor->seat_list, link)
+		weston_seat_next_keymap_layout(seat);
+}
+
 static void
 shell_reposition_view_on_output_destroy(struct weston_view *view)
 {
@@ -4924,6 +4938,10 @@ shell_add_bindings(struct weston_compositor *ec, struct desktop_shell *shell)
 					  workspace_move_surface_down_binding,
 					  shell);
 
+	weston_compositor_add_key_binding(ec, KEY_SPACE, MODIFIER_SUPER,
+					  keyboard_layout_next_index,
+					  shell);
+
 	/* Add bindings for mod+F[1-6] for workspace 1 to 6. */
 	if (shell->workspaces.num > 1) {
 		num_workspace_bindings = shell->workspaces.num;
diff --git a/libweston/compositor.h b/libweston/compositor.h
index 8b2d2b06..f6a08af7 100644
--- a/libweston/compositor.h
+++ b/libweston/compositor.h
@@ -1742,6 +1742,8 @@ void
 weston_seat_repick(struct weston_seat *seat);
 void
 weston_seat_update_keymap(struct weston_seat *seat, struct xkb_keymap *keymap);
+void
+weston_seat_next_keymap_layout(struct weston_seat *seat);
 
 void
 weston_seat_release(struct weston_seat *seat);
diff --git a/libweston/input.c b/libweston/input.c
index 81a94a92..b3998018 100644
--- a/libweston/input.c
+++ b/libweston/input.c
@@ -1933,6 +1933,42 @@ update_keymap(struct weston_seat *seat)
 		send_modifiers(resource, wl_display_get_serial(seat->compositor->wl_display), keyboard);
 }
 
+WL_EXPORT void
+weston_seat_next_keymap_layout(struct weston_seat *seat)
+{
+	struct weston_keyboard *keyboard = weston_seat_get_keyboard(seat);
+	xkb_mod_mask_t latched_mods;
+	xkb_mod_mask_t locked_mods;
+	xkb_layout_index_t layout_index;
+	struct wl_resource *resource;
+
+	latched_mods = xkb_state_serialize_mods(keyboard->xkb_state.state,
+						XKB_STATE_MODS_LATCHED);
+	locked_mods = xkb_state_serialize_mods(keyboard->xkb_state.state,
+					       XKB_STATE_MODS_LOCKED);
+	layout_index = xkb_state_serialize_group(keyboard->xkb_state.state,
+						 XKB_STATE_EFFECTIVE);
+	layout_index = ((layout_index + 1) %
+			xkb_keymap_num_layouts(keyboard->xkb_info->keymap));
+
+	xkb_state_update_mask(keyboard->xkb_state.state,
+			      0, /* depressed */
+			      latched_mods,
+			      locked_mods,
+			      0, 0, layout_index);
+
+	notify_modifiers(seat, wl_display_next_serial(seat->compositor->wl_display));
+
+	wl_resource_for_each(resource, &keyboard->resource_list)
+		send_modifiers(resource,
+			       wl_display_get_serial(seat->compositor->wl_display),
+			       keyboard);
+	wl_resource_for_each(resource, &keyboard->focus_resource_list)
+		send_modifiers(resource,
+			       wl_display_get_serial(seat->compositor->wl_display),
+			       keyboard);
+}
+
 WL_EXPORT void
 notify_key(struct weston_seat *seat, uint32_t time, uint32_t key,
 	   enum wl_keyboard_key_state state,

sudo ./build/interactive-evdev -l de,de,us,us -v ,neo,dvorak-alt-intl, -o grp:menu_toggle

sudo ./build/interactive-evdev -l us -v dvorak-alt-intl

keysyms [ Control_L        ] unicode [  ] layout [ German (0) ] level [ 0 ] mods [ ] leds [ Group 2 ] 
keysyms [ Shift_L          ] unicode [  ] layout [ German (0) ] level [ 0 ] mods [ Control ] leds [ Group 2 ] 
keysyms [ C                ] unicode [ � ] layout [ English (Dvorak alternative international no dead keys) (2) ] level [ 1 ] mods [ -Shift Control ] leds [ Group 2 ] 

keysyms [ Control_L        ] unicode [  ] layout [ English (Dvorak alternative international no dead keys) (0) ] level [ 0 ] mods [ ] leds [ ] 
keysyms [ Shift_L          ] unicode [  ] layout [ English (Dvorak alternative international no dead keys) (0) ] level [ 0 ] mods [ Control ] leds [ ] 
keysyms [ C                ] unicode [ � ] layout [ English (Dvorak alternative international no dead keys) (0) ] level [ 1 ] mods [ -Shift Control ] leds [ ]