Merge "TouchInputMapper: Fix display association for POINTER mode" into main