When I grep for ``cli.focusOnPin`` I see 5 places where it's called. Maybe we should move this to within the ``cli.focusOnPin()`` function? That might be weird. I'm not sure where exactly this code should execute but if you test all the PIN flows you can probably figure it out.