Merge "Update strings in battery settings." into pi-dev