Merge "DO NOT MERGE: Treat unknown tooltype as touch." into nyc-mr1-dev