Merge proposals dependent on lp://qastaging/~sladen/unity-lens-files/unity-place-files-icon-lp745555

1. unity-place-files-icon-lp745555
2. Dependent merge proposals