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