Merge "[Reskin] Add new string for battery settings" into main