Merge "Fix smooth panel deceleration" into nyc-dev