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

Change-Id: I94d2668e2387d6f0396031fcceb0ca25e96da358