Merge proposals dependent on lp:~santileortiz/gala/fix_xkb_configuration

lp:~santileortiz/gala/fix_xkb_configuration has no merge proposals.