NXP-13342 Avoid reentrency caused by a listener