Merge "Refcount 9-patches and properly handle GC events"