Merge "Add default horizontal margin to buttons" into sc-v2-dev