Merge "Do not add padding left/right when cell layout border spacing exists." into sc-dev