Merge "Add desktop_stats to SettingsToPropertiesMapper" into main