Merge "Add null check when ActivityRecord is refetched" into oc-mr1-dev
am: 1fee204686

Change-Id: I4a434ebd87377cf249274168f71d6eeb714cfe63