Move trait-tracker popup to above tracker

[#69924076]
Show parent popup after traits; hide popup on trait selection

[#69924076]