Merge "Don't interpolate the STL size when overscrolling" into main