Merge "CursorInputMapper_test: Verify acceleration updated on display change" into main