Merge "[SettingsLib] Update "fix" shim to use new Wifi subsystem restart callbacks"