Merge "Make metered wifi controller resilient to null config" into pi-dev