Merge "Reconfigure device in TouchInputMapper when the type is changed." into udc-dev