unity-lens-files

Merge proposals dependent on lp://qastaging/~mhr3/unity-lens-files/folder-fixes

  1. folder-fixes
  2. Dependent merge proposals

lp://qastaging/~mhr3/unity-lens-files/folder-fixes has no merge proposals.