[Merge] lp:~phablet-team/ubuntu-system-settings/settings-listitems into lp:ubuntu-system-settings

[Alberto Mardegan]

Please let me know what I should do with https://code.launchpad.net/~mardy/ubuntu-system-settings/smoothed-1596529/+merge/298419

I think there will be some conflict with this branch.
-- 
https://code.launchpad.net/~phablet-team/ubuntu-system-settings/settings-listitems/+merge/278322
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/ubuntu-system-settings/settings-listitems.