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

Change-Id: Ifd3c5ce0f2857d30a1fd9b632a2fcc0522cedf70