Merge "Fix broken runtime SetStatsEnabled logic"