Merge "Update battery not charging state string" into sc-dev