Merge "Consolidate RecentTaskInfo and RunningTaskInfo into TaskInfo class"