Merge "Add flags for IPsec packet loss detector improvements" into main