Merge "Revert "Revert "Prevent UAF issues caused by static destructors"""