Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-dev am: 133e0a7eea am: 4c05b6281c

Change-Id: Ic62495057fe5008169cdad210635edd9fb0c3246