Merge "Fix widget restore flow" into rvc-dev am: 79738545 am: afbd2298 am: b6e7c8f5 am: 4503e768 Change-Id: I4511dcba777028c4aa7c24551c1f2c94c60cc73c