Merge "handle a race condition where a cursor receives an inflight onChange after the cursor has been closed"