Merge "Migrate to LocalOverscrollFactory" into main