Merge proposals dependent on lp://staging/~michael.nelson/ubuntu-webcatalog/987838-no-screenshot-for-extras

1. 987838-no-screenshot-for-extras
2. Dependent merge proposals