Merge "Full-data restore path needs to pass along the widget metadata" into nyc-dev