Merge "Moving SettingsChangeLogger back to MainThreadInitializedObject" into main