fix #12395 Gridx ColumnLock: locked column does not re-render height when extra content added to non-locked columns

Conflicts:
	modules/ColumnLock.js
Merge branch '1.2' of https://github.com/oria/gridx into 1.2