Merge "Revert "Add stackId to RecentTaskInfo""