Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: I92b91cce499ed4bec64521a581276f397792e218

diff --cc src/imports/window/plugin.cpp
Simple merge

diff --cc src/quick/items/qquickscreen.cpp
Simple merge

diff --cc src/quick/items/qquickwindow.cpp
Simple merge