Merge "Bring insets fields back to AttachInfo"