Merge "Move activity finish methods to ActivityRecord"