Merge "Restore fragment transaction animation state information." into nyc-dev