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