Merge "Add tron counter for battery % too"