Merge "[Reskin] Update string of incompatible charging on battery settings" into main