Merge "Update filter logic for BatteryDiffEntries" into sc-dev