Merge "Revert "Fix widget restore for pre-archived apps"" into main