Merge "Update battery settings string" into sc-dev