Merge "Add flag for miscellaneous BatteryStats streamlining" into main