Merge "Fix NPE in TouchpadDebugViewTest" into main