Merge proposals dependent on lp:~larsu/ubuntu-settings-components/remove-icon-lookup-hack

lp:~larsu/ubuntu-settings-components/remove-icon-lookup-hack has no merge proposals.