Merge "Add unit tests for SettingsChangeLogger" into main