Merge proposals dependent on lp:~jonas-drange/ubuntu-system-settings/update-reset-launcher-test

1. update-reset-launcher-test
2. Dependent merge proposals