set auto right/left margin on button-primary
Merge branch 'button-margin-fix' into v2.2.0