Merge "Introducing activityType window configuration."