Merge "Fix NPE in TouchpadDebugViewController" into main