[DataGrid] Fix regression with GridTemplateColumns
#3357
+1
−6
Merged