Merge proposals dependent on lp://qastaging/~alexlauni/webapps-applications/webapps-application-Launchpad

1. webapps-application-Launchpad
2. Dependent merge proposals