Merge proposals dependent on lp://qastaging/~ci-train-bot/ubuntu-settings-components/ubuntu-settings-components-ubuntu-xenial-landing-041

1. ubuntu-settings-components-ubuntu-xenial-landing-041
2. Dependent merge proposals