Merge proposals dependent on lp://staging/~ps-jenkins/unity-lens-files/latestsnapshot-7.0daily13.05.07ubuntu.unity.experimental.certified-0ubuntu1

1. latestsnapshot-7.0daily13.05.07ubuntu.unity.experimental.certified-0ubuntu1
2. Dependent merge proposals