Merge "Refine BatteryInfo and battery drawable" into oc-dev