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