Merge "Update string for battery seekbar" into pi-dev