Merge proposals dependent on lp://qastaging/~kamstrup/unity-lens-files/gi-friendly-api-tweaks

lp://qastaging/~kamstrup/unity-lens-files/gi-friendly-api-tweaks has no merge proposals.