chore(windows): Merge branch 'feat/windows/add-state-machine-o-updates' into feat/windows/add-apply-now-update