Merge "New battery meter view bolt shape + color." into klp-dev