Merge proposals dependent on lp://qastaging/~unity-team/unity-lens-video/remote-videos-scope-12.04

1. remote-videos-scope-12.04
2. Dependent merge proposals