Make sure text boxes are given proper dimensions after hot-swapping
Merge branch 'dev' into release-candidate