Merge "Move network selection utils to Connectivity"