Merge proposals dependent on lp:~cimi/ubuntu-system-settings/workaround_lp1334429

lp:~cimi/ubuntu-system-settings/workaround_lp1334429 has no merge proposals.