Merge "Further restrict activity launch on virtual displays" into oc-dev
am: 36dbd3d43f

Change-Id: I30a4083e9c8467dd8698b50f0999b5ae20f2e01c