Merge "Add charging string V2 for settings" into 24D1-dev