Merge proposals dependent on lp://staging/~robert-ancell/lightdm/xorg-displayfd

lp://staging/~robert-ancell/lightdm/xorg-displayfd has no merge proposals.