Merge remote-tracking branch 'origin/pr/255'

* origin/pr/255:
  Improve layout filtering of options for setxkbmap

qubesadmin/tools/qvm_start_daemon.py

@@ -180,7 +180,7 @@ def __init__(self, binary_string):
         self.variants = split_string[3].decode().split(',')
         self.options = split_string[4].decode()
         self.options = ",".join(opt for opt in self.options.split(",")
-                                if not opt.endswith("_toggle"))
+                                if not opt.startswith("grp:"))
 
     def get_property(self, layout_num):
         """Return the selected keyboard layout as formatted for keyboard_layout