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

Change-Id: Ic73a2d9b97901826e7697168238c932a1d70cf22