Adding spacing variables to component resets instance overrides

Example I have a component with auto-layout padding set to 12px, and in an instance I override this value to be 10px. If I update the component to use a variable (eg --space-small/12px), the instance padding gets reset to the same variable instead of remaining overridden.

This is obviously difficult to identify where/when it is happening.

Anyone else experienced this issue and/or have any advice on how to deal with it?