With the switch to libinput/libxkbcommon both X and non-X keyboard layouts
are available but only the non-X layouts should be loaded when both are
present in the system.