Merge "Fix widget restore flow" into rvc-dev am: 79738545 am: efe4556e am: 5e25d7ee am: f36b053f Change-Id: I3a13bacec204ef1d48fe28e49cbd2486a8573d92