Merge "BatteryStats: Increase max size of subsystem state string" into sc-dev