Thanks to @CommonsWare comment!
I printed getResources().getConfiguration() and saw that one has in it :
sw752dp and the other had sw711dp
So I added the folders res/values-sw752dp and res/values-711dp with dimens.xml unique for each one and it worked!
These are the getResources().getConfiguration():
S7:{1.0 ?mcc?mnc [en_US] ldltr sw752dp w1204dp h680dp 340dpi lrg land finger -keyb/v/h -nav/h winConfig={ mBounds=Rect(0, 0 - 2560, 1600) mAppBounds=Rect(0, 0 - 2560, 1498) mWindowingMode=fullscreen mDisplayWindowingMode=fullscreen mActivityType=standard mAlwaysOnTop=undefined mRotation=ROTATION_90} s.1 desktop/d dc/d ?dcui ?dcaf bts=0 ff=0 bf=0 themeSeq=0}
S6:{1.0 ?mcc?mnc [en_US] ldltr sw711dp w1137dp h639dp 360dpi lrg hdr widecg land finger -keyb/v/h -nav/h winConfig={ mBounds=Rect(0, 0 - 2560, 1600) mAppBounds=Rect(0, 0 - 2560, 1492) mWindowingMode=fullscreen mDisplayWindowingMode=fullscreen mActivityType=standard mAlwaysOnTop=undefined mRotation=ROTATION_90} s.1 desktop/d dc/d bts=0 ff=0 bf=0}