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