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