Merge "CursorInputMapper: migrate remaining tests" into main