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

Change-Id: I8d67796f837783494188a841a5168b0672c1f225