Merge "Make singleTop activity be created with different display" into sc-dev