Merge "Update strings for battery settings"