NXP-12102/NXP-12238: follow api changes that break DnD on DAM