Merge "[StatsCompanionService] Updated ShutdownEventReceiver handling" into main