Merge "Add stackId to RecentTaskInfo"