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