Don't wait with resizing window
Merge branch 'next' into ready-for-testing