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

Change-Id: I0a08e4de896c13034ca4c5349b470a469d1fb5df