Merge "Migrate attribute sudMarginSides into sudMarginStart and sudMarginEnd for settings"