Merge "Fix broken runtime SetStatsEnabled logic" into lmp-dev