Merge "CDD: launching activities on secondary displays" into oc-dev