Merge "Clean up GC callbacks to be virtual methods"