Merge branch 'main' into theAlexes/cleanup

diff --cc movement/movement.c
index 05b2a078427bdeb44b19715707ae3cba60cb0abd,2f4bec7f148a919cd9fdb35c6dfe0a091615d191..29832ba8f3120e55c6865cb9460d284d5436d35b
--- 1/movement/movement.c
--- 2/movement/movement.c
+++ b/movement/movement.c
@@@ -445,7 -450,7 +451,8 @@@ static void _sleep_mode_app_loop(void) 
  }
  
  bool app_loop(void) {
 +    wf = &watch_faces[movement_state.current_face_idx];
+     bool woke_up_for_buzzer = false;
      if (movement_state.watch_face_changed) {
          if (movement_state.settings.bit.button_should_sound) {
              // low note for nonzero case, high note for return to watch_face 0

diff --cc movement/movement.h
Simple merge