fixup! refactor(core): unify touch and button handling, enable usage of both in one model

core/src/apps/debug/__init__.py

@@ -9,7 +9,7 @@ if __debug__:
     import trezorui2
     from storage import debug as storage
     from storage.debug import debug_events
-    from trezor import log, loop, utils, wire
+    from trezor import log, loop, wire
     from trezor.enums import MessageType
     from trezor.messages import DebugLinkLayout, Success
     from trezor.ui import display

core/src/trezor/ui/__init__.py

@@ -121,7 +121,7 @@ class Component:
         self.repaint = True
 
     def dispatch(self, event: int, x: int, y: int) -> None:
-        from trezor.utils import USE_TOUCH, USE_BUTTON
+        from trezor.utils import USE_BUTTON, USE_TOUCH
 
         if event is RENDER:
             self.on_render()