Merge "Resolve associated display and pointer display in CursorInputMapper"