[CDF-380] - CCC - HeatGrid - A null size value and a non-null color valu...

...e no longer show a colored null symbol (cross) instead.

* Another refactoring that went wrong, by changing the order of execution of something to after it was needed.

@pamval please review.