Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into qt-dev am: 3d4cf34685

Change-Id: I427d795236c2e5070b6c7dc13cb6ee1da8211beb