Merge proposals dependent on lp://qastaging/~jonas-drange/ubuntu-system-settings/cellular-connectiontype-fixdesign

1. cellular-connectiontype-fixdesign
2. Dependent merge proposals