Merge "Fix NullPointerException in NetworkProviderSettings" into main