Merge "Update TouchInputMapper to support new VirtualNavigationTouchpad."