Merge "Update lastExpectedPresentTime when cadence changes" into main