Merge proposals dependent on lp://staging/~schwann/ubuntu-system-settings/settings-picker-hint

1. settings-picker-hint
2. Dependent merge proposals