Merge "Ensure consistency of BatteryUsageStats deltas" into main