Merge "Further restrict activity launch on virtual displays" into oc-dev