Merge "Remove redundant appInfo field in ActivityRecord"