Merge "Refactor ActivityRecord#finish* methods"