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

Change-Id: I210f626ac2f0c921cb2026dfe09c752e1aa06deb