Merge proposals dependent on lp://qastaging/~system-settings-touch/ubuntu-system-settings/run-tests

1. run-tests
2. Dependent merge proposals