Merge proposals dependent on lp:~stolowski/unity-scopes-shell/prepopulate-scopes-when-locked

1. prepopulate-scopes-when-locked
2. Dependent merge proposals