Merge proposals dependent on lp:~mardy/ubuntu-system-settings-online-accounts/auth-scrolling-1561031

1. auth-scrolling-1561031
2. Dependent merge proposals