Merge "Immediately stop bouncing transitions if the overscroll is empty" into main