Merge proposals dependent on lp://qastaging/~unity-team/unity-lens-video/match-latest-design

1. match-latest-design
2. Dependent merge proposals