- Fixes #15109 - also fix GotUid race with InvalidAddress supervision event (cherry picked from commit 3fe83fa)