Merge proposals dependent on lp:~elementary-pantheon/switchboard-plug-keyboard/xkb-remove-unused-method

1. xkb-remove-unused-method
2. Dependent merge proposals