Merge proposals dependent on lp://qastaging/~jonas-drange/ubuntu-system-settings/harden-clickclient-test

1. harden-clickclient-test
2. Dependent merge proposals