Merge proposals dependent on lp://qastaging/~azzar1/unity-lens-files/add-filesystem-icons

lp://qastaging/~azzar1/unity-lens-files/add-filesystem-icons has no merge proposals.