am 3dfa5eb9: Merge "Toward regularizing color & level across battery indicators." into klp-dev

* commit '3dfa5eb9d9eeb12d761194cb06dc1ba63ed61e95':
  Toward regularizing color & level across battery indicators.