Merge "Update battery charging status string" into sc-dev