Merge "Determine whether to support activities in multi window (3/n)" into sc-dev