I cannot see any change related to $active-border variable apart from !default. Plus, $active-border should not be allowed to edit. It is a structural variable and not a variable which affects theme change.
Please revert the $active-border change and send the patch.