Merge "Move activity-related methods to ActivityRecord"