Merge "[archive] optimize clearArchiveState a bit" into main