Merge "Reset activity reference after invalidation" into sc-dev