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

Change-Id: I31b28f404cf34ec451f5938eeb97321743bb6cdd