Merge "Account for archive apps in ApplicationsState" into main