Merge proposals dependent on lp://staging/~canonical-ca-hackers/ubuntu-webcatalog/962141-multiple-screenshots-for-all-apps

1. 962141-multiple-screenshots-for-all-apps
2. Dependent merge proposals