Merge proposals dependent on lp://qastaging/~kamstrup/unity/gio-vapi-break-fixes

lp://qastaging/~kamstrup/unity/gio-vapi-break-fixes has no merge proposals.