Merge "TouchpadInputMapper: rotate pointer movement with display"