Merge "Write/read intermediate states during widget restore" into main