Merge "CursorInputMapper: Use flat velocity params when acceleration is disabled" into main