Merge "Use WifiManager for wifi backup/restore"