Merge "Fix widget restore flow" into rvc-dev