Merge "Clean up flag ipsec_transform_state" into main