Merge "InputMapper refactor: CursorInputMapper" into udc-dev