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