Merge "Resolve associated display and pointer display in CursorInputMapper" into tm-qpr-dev