Merge "Add null check when ActivityRecord is refetched" into oc-mr1-dev