Merge "Clear more native pointers in finalizers"