Merge "Update battery settings strings" into pi-dev