NXP-15020 fix wrong metrics displayed at event admin level (regression in 5.8 on await termination)