Merge "TouchInputMapper: add missing includes" into main