Merge "Don't interpolate animated values when overscrolling" into main