Merge "Delay pinned animation finish during app transition." into nyc-dev