Merge "Clean up allow_disable_ipsec_loss_detector flag" into main