Merge "dumpstate: dump more touch information" into sc-dev