Merge proposals dependent on lp:~elementary-pantheon/switchboard-plug-keyboard/organize-source

1. organize-source
2. Dependent merge proposals