Merge "Add 4dp round corner for SettingsCardContent" into main