Merge proposals dependent on lp://staging/~untrusted-ci-dev-bot/ubuntu-themes/ubuntu-themes-ubuntu-yakkety-landing-004

1. ubuntu-themes-ubuntu-yakkety-landing-004
2. Dependent merge proposals