Merge "BatteryStats: Prevent double-detaching Counter"