Port RF-13615 - fix column resizing