Merge "InputMapper refactor: CursorInputMapper"