[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into qt-dev am: 3d4cf34685 am: 3e8ad0c666 -s ours

am skip reason: subject contains skip directive

Change-Id: Ibd87b8f93f8016869a5407e60acbee86222bdc95