Improve UPower battery device detection