Improve thread safety of SPDataStorage NSPointerArray tracking to further improve #1884 and fix count tracking when removing a single row