Merge "Fix widget restore flow" into rvc-dev am: 7973854504

Change-Id: Ia7d3c4ee302a11653ee4ec11f86efabb8c28e5c7