Merge "Refactor SettingsChangeLoggerTest imports" into main