LPS-45693 Properly clean all listeners inside add panels