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

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