Merge "Restrict launching activities on virtual displays" into oc-dev
am: b0c5d67bf1

Change-Id: Ic2361cab5ee66552f7d1714cfca0cc320c02ed30