Merge proposals dependent on lp://staging/~ci-train-bot/ubuntu-themes/ubuntu-themes-ubuntu-cosmic-3356

1. ubuntu-themes-ubuntu-cosmic-3356
2. Dependent merge proposals