Merge "Use ACCEL_DEACCEL when swiping up to enter grid" into sc-dev