Merge "Disable unnecessary operation in the streamlined BatteryStats mode" into main