Merge "Export loadNameAndIcon() method out for BatteryDiffEntry reusing." into sc-dev