Merge "[Settings] Code refactor DataSaverSummary"