Merge "Add content description for battery charging status icon" into main