Merge remote-tracking branch 'upstream/3.4' into merge-3.4

diff --cc modules/dnn/src/onnx/onnx_importer.cpp
Simple merge

diff --cc modules/highgui/src/window_QT.cpp
Simple merge

diff --cc modules/videoio/src/container_avi.cpp
Simple merge