Merge proposals dependent on lp://staging/xorg-server

lp://staging/xorg-server has no merge proposals.