Merge "Add a debug flag to convert all touch pointers to stylus"