Merge "SettingsLib: Handle WifiService being null" into main