Merge "Renamed a few methods in ActivityRecord (42/n)."