Merge proposals dependent on lp://qastaging/~dobey/ubuntu-app-launch/fix-legacy

lp://qastaging/~dobey/ubuntu-app-launch/fix-legacy has no merge proposals.