Merge "Add view name when tracing View.onTouchListener#onTouch" into main