[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows...

[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into qt-dev am: 3d4cf346 am: 3e8ad0c6 -s ours am: d6d7e76e am: 64ee82bf am: 90994c5e am: 3357b70c am: a9e28263 -s ours

am skip reason: subject contains skip directive

Change-Id: Ie1bf7e19260f8758b517ca9b3c8ab802ae55bad3