Merge "bufferpool2: fix native handle race condition"