Merge branch 'core-data-sync-trio' of github.com:nightscout/Trio-dev into beta-fixes-2nd-iteration

FreeAPS/Sources/Modules/Home/View/Header/PumpView.swift

@@ -108,7 +108,7 @@ struct PumpView: View {
                             .fontDesign(.rounded)
                     }
                     // aligns the stopwatch icon exactly with the first pixel of the reservoir icon
-                    .padding(.leading, 12)
+                    .padding(.leading, date.timeIntervalSince(timerDate) > 0 ? 12 : 0)
                 }
             }
         }