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

Change-Id: Iea0afa18746c4b04d12433902140d65d4af50c8e