Merge proposals dependent on lp:~png2378/switchboard-plug-keyboard/fix-1597871

lp:~png2378/switchboard-plug-keyboard/fix-1597871 has no merge proposals.