Merge proposals dependent on lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/dependency-1659486

1. dependency-1659486
2. Dependent merge proposals