Merge "Fix StatsCompanionService sometimes can be null" into pi-dev