Merge branch 'main' into endless_runner_port

diff --cc movement_faces.h
index bcd82330bf5115171549ca6312fd68672c93584b,fab9ee3116de9cb83f3a805aa3cdac28fef4e171..84d08f24607ca32469407ccece8ccb855c298ee5
--- 1/movement_faces.h
--- 2/movement_faces.h
+++ b/movement_faces.h
@@@ -73,5 -73,5 +73,6 @@@
  #include "wareki_face.h"
  #include "deadline_face.h"
  #include "wordle_face.h"
+ #include "blackjack_face.h"
 +#include "endless_runner_face.h"
  // New includes go above this line.

diff --cc watch-faces.mk
index 95d81875ae082240385f64fd6a44dcd46ea202b5,52919f53f694efcc52333b8bd44df0a8a90afdd8..c0d9a49bc932d02552c637d53ea895cdb3250672
--- 1/watch-faces.mk
--- 2/watch-faces.mk
+++ b/watch-faces.mk
@@@ -48,5 -48,5 +48,6 @@@ SRCS += 
    ./watch-faces/sensor/lis2dw_monitor_face.c \
    ./watch-faces/complication/wareki_face.c \
    ./watch-faces/complication/deadline_face.c \
+   ./watch-faces/complication/blackjack_face.c \
 +  ./watch-faces/complication/endless_runner_face.c \
  # New watch faces go above this line.