am 633626a0: am 6e0b89a5: am 47c46dd5: Merge "Battery icon tweaks." into klp-dev

* commit '633626a096bc38f44759564f59d947a2f34b5bc3':
  Battery icon tweaks.