Merge "Prevent CurrentClock flow from holding onto initial value indefinitely" into main