Merge "Revert "[Settings] Code refactor DataSaverSummary""