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

Change-Id: Ieb098ddfdfb5deeb8c505b96c010e1e4281b754c