Merge "Fix NPE when getting VPN underlying network capabilities" into main