Merge "Simplify the swipe offset animation logic" into main