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