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