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