Merge "Fix bugs around restoring nested retained instance fragments" into nyc-dev