Merge proposals dependent on lp://qastaging/~daker/xdg-launcher/new-fixes

lp://qastaging/~daker/xdg-launcher/new-fixes has no merge proposals.