Merge proposals dependent on lp://staging/~mhr3/unity-lens-files/fix-scope-dir

lp://staging/~mhr3/unity-lens-files/fix-scope-dir has no merge proposals.