Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into qt-dev