Merge proposals dependent on lp:~elementary-pantheon/switchboard-plug-keyboard/add-layout-organization

1. add-layout-organization
2. Dependent merge proposals