Merge "Fix missing read of widget data in adb restore."