Merge "Fix uninstallation flow for archived apps on server side." into main