Updated selection tracker

app/src/main/java/androidx/recyclerview/selection/StableIdKeyProvider.java

@@ -85,7 +85,7 @@ public final class StableIdKeyProvider extends ItemKeyProvider<Long> {
             }
             return;
         }
-        int position = holder.getAdapterPosition();
+        int position = holder.getAbsoluteAdapterPosition();
         long id = holder.getItemId();
         if (position != RecyclerView.NO_POSITION && id != RecyclerView.NO_ID) {
             mPositionToKey.put(position, id);
@@ -102,7 +102,7 @@ public final class StableIdKeyProvider extends ItemKeyProvider<Long> {
             }
             return;
         }
-        int position = holder.getAdapterPosition();
+        int position = holder.getAbsoluteAdapterPosition();
         long id = holder.getItemId();
         if (position != RecyclerView.NO_POSITION && id != RecyclerView.NO_ID) {
             mPositionToKey.delete(position);

app/src/main/java/androidx/recyclerview/selection/ViewAutoScroller.java

@@ -263,7 +263,7 @@ final class ViewAutoScroller extends AutoScroller {
         @Override
         void scrollBy(int dy) {
             if (VERBOSE) Log.v(TAG, "Scrolling view by: " + dy);
-            mView.scrollBy(0, dy);
+            mView.nestedScrollBy(0, dy);
         }
 
         @Override