Merge \"Fix smooth panel deceleration\" into nyc-dev
am: e858432241

Change-Id: I2520d88620d5f3f12cab60a9422db8a41e40bec8