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

1. organize-source
2. Dependent merge proposals