Merge proposals dependent on lp:~jonas-drange/ubuntu-system-settings/wifi-hide-other-fix-1377076

1. wifi-hide-other-fix-1377076
2. Dependent merge proposals