Merge "Battery stats tweaks."