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

Change-Id: I9d5aa24139be221eee135a7d1bf1a98e57ae018c