Merge proposals dependent on lp://qastaging/~stolowski/unity-lens-applications/merge-smartscopes

1. merge-smartscopes
2. Dependent merge proposals