Pull in Remove deadlock in resize

However, this leaves the unfortunate problem that resizing QQuickView is
not looking as smooth as one could wish for

Change-Id: I369ede46a8345bfc3867cf13251a5ad6cac5ee3f