Merge "Add traces for touch events and fix trace naming" into sc-dev