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

Change-Id: Ieda71d0caa7132b37c1c3d544233c1f60079d130