Merge "Add battery illustration" into pi-dev