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

Change-Id: Ib8d85b8c96ff2590669e39134623456a2004d008