Merge proposals dependent on lp:~donadigo/switchboard-plug-networking/wifi-list-placeholders

1. wifi-list-placeholders
2. Dependent merge proposals