Restore height override before height calculations.
Merge pull request #3789 from thomasgohard/fix-equalheight-window-resize

[Equal height] Restore height override before height calculations