Merge "Migrate to SettingsStatsLog from StatsLog"