Merge branch 'main' into default-handler

diff --cc movement/movement.c
Simple merge

diff --cc movement/watch_faces/complication/alarm_face.c
index 4c0befdeef0d3e9424cf17a3922639f8a8977af2,52a6c5422d12d54db3b70bca1b2732e49542a73f..479f2f1ee30fc9ac3d8f5b46bf1290d19abd639f
--- 1/movement/watch_faces/complication/alarm_face.c
--- 2/movement/watch_faces/complication/alarm_face.c
+++ b/movement/watch_faces/complication/alarm_face.c
@@@ -445,8 -448,7 +445,8 @@@ bool alarm_face_loop(movement_event_t e
          movement_move_to_face(0);
          break;
      default:
-       break;
 +        movement_default_loop_handler(event, settings);
+         break;
      }
  
      return true;

diff --cc movement/watch_faces/complication/countdown_face.c
Simple merge

diff --cc movement/watch_faces/complication/sailing_face.c
Simple merge

diff --cc movement/watch_faces/complication/tarot_face.c
index ec42865a5f7045c0047462b2495e02b4333c5cea,39feaf15e85ba1e37a4a88bc716c24bb727450dc..403a92df121176aa52dd020f335159e26a75da6e
--- 1/movement/watch_faces/complication/tarot_face.c
--- 2/movement/watch_faces/complication/tarot_face.c
+++ b/movement/watch_faces/complication/tarot_face.c
@@@ -246,8 -244,13 +244,10 @@@ bool tarot_face_loop(movement_event_t e
              tarot_display(state);
              break;
          case EVENT_TICK:
-             display_animation(state);
+             if (state->is_picking) {
+                 display_animation(state);
+             }
              break;
 -        case EVENT_MODE_BUTTON_UP:
 -            movement_move_to_next_face();
 -            break;
          case EVENT_LIGHT_BUTTON_UP:
              if (state->drawn_cards[0] == 0xff) {
                  // deck is inited; cycle through # cards to draw