Don't set frozen column count before columns have been updated (#13334)

Change-Id: I63ab65dad6dacfb5dafe55147c18d3e4ec0e36a5