Merge "Fixes SettingsChangeLoggerTest failures" into main