Merge "Reduce jank during pinned stack animation" into nyc-dev