Circle Battery

Use a new preference category for battery options
Enable native battery percentage only if icon style is set
Merge branch 'kk-ras-mr1' of https://github.com/rascarlo/android_packages_apps_settings into kk