Merge "Modify multi-display Activity launching behavior" into sc-dev