Merge "[Spa] Add dismiss button for SettingsCard" into main