Merge "Do not enter touch mode on non-touchscreen events"