Merge proposals dependent on lp:~vikoadi/switchboard-plug-keyboard/fix-options

lp:~vikoadi/switchboard-plug-keyboard/fix-options has no merge proposals.