Merge "Support disabling IPsec packet loss detector" into main