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

Change-Id: I1bfe8c43ccfff70afb315a7df2c805fc83a1b0d0