Merge "init: move `MarkServicesUpdate` later" into main