Merge "Fix a crash where activityInfo should not be stored."