Merge proposals dependent on lp://staging/~ci-train-bot/ubuntu-settings-components/ubuntu-settings-components-ubuntu-zesty-2288

1. ubuntu-settings-components-ubuntu-zesty-2288
2. Dependent merge proposals