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