Merge proposals dependent on lp://qastaging/~untrusted-ci-dev-bot/ubuntu-settings-components/ubuntu-settings-components-ubuntu-xenial-17

1. ubuntu-settings-components-ubuntu-xenial-17
2. Dependent merge proposals