Merge "Battery icon tweaks." into klp-dev