Merge proposals dependent on lp://qastaging/~abreu-alexandre/webapps-applications/preinstalled-webapps-launcher-migration

1. preinstalled-webapps-launcher-migration
2. Dependent merge proposals