Merge proposals dependent on lp://qastaging/~gary-lasker/software-center/launcher-integration-plan-b

1. launcher-integration-plan-b
2. Dependent merge proposals