Merge "[Spa] Update button style for SettingsCard" into main