Merge "[Thread] fix upstream network selector to exclude VPN" into main