wayland: Moved here from cross-opt