Merge "Revert "Revert "Add missing null check to String::ToCharArray"""