Merge "TouchpadInputMapper: rotate multi-finger swipes with display"