TrackerUI/Types: Fix warnings
Add trap lifecycle control