Merge "Fixing StatsLogger not getting activityContext" into main