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

Change-Id: I4d66bd10517e05b2b9e930ad4860b371df0bc724