NXP-14388: Keep the controller
NXP14388: Fix when leaving without binding