Merge "Restrict launching activities on virtual displays" into oc-dev am: b0c5d67bf1 am: cd02bf1676
am: 851f200b08

Change-Id: If1178cd4ba4861bc79afce001112fc442185aa5d