keyboard: Fix consecutive xkb grp: options not being stripped

https://bugzilla.gnome.org/show_bug.cgi?id=726649